Revision: bazaar--devel--1.4--patch-6
Archive: robert.collins@canonical.com--mac
Creator: Robert Collins <robert.collins@canonical.com>
Date: Mon May 16 18:13:22 EST 2005
Standard-date: 2005-05-16 08:13:22 GMT
Modified-files: annotate/annotate.c
    annotate/tests/Makefile.in commands/ancestry-graph.c
    commands/ancestry.c commands/annotate.c commands/log.c
    commands/resolved.c commands/tests/Makefile.in
    commands/undo.c libarch/ancestry.c libarch/ancestry.h
    libarch/annotated-file.c libarch/annotated-file.h
    libarch/annotation-builder.c libarch/build-revision.c
    libarch/commit.c libarch/conflict-handling.c
    libarch/import.c libarch/invent.c libarch/local-cache.c
    libarch/merge.c libarch/patch-id.c libarch/patch-id.h
    libarch/pfs-dav.c libarch/project-tree.c
    libarch/project-tree.h libarch/tag.c
    libarch/tests/Makefile.in libarch/tests/unit-annotate.c
    libarch/tests/unit-patch-id.c libawk/relational.c
    libawk/relational.h libinifile/tests/Makefile.in
    tests/test-annotate.sh tests/test-inventory.sh
    tests/test-undo.sh
New-patches: jblack@gnuarch.org--2005/baz--undorelative--1.4--base-0
    jblack@gnuarch.org--2005/baz--undorelative--1.4--patch-1
    john@arbash-meinel.com--tla-2004/bazaar--logs--1.3--base-0
    john@arbash-meinel.com--tla-2004/bazaar--logs--1.3--patch-1
    john@arbash-meinel.com--tla-2004/bazaar--logs--1.3--patch-5
    john@arbash-meinel.com--tla-2004/bazaar--logs-b--1.3--base-0
    john@arbash-meinel.com--tla-2004/bazaar--logs-b--1.3--patch-1
    john@arbash-meinel.com--tla-2004/bazaar--logs-b--1.3--patch-2
    john@arbash-meinel.com--tla-2004/bazaar--logs-b--1.3--patch-3
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-47
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-48
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-49
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-50
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-51
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-52
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-53
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-54
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-55
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-56
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-57
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-58
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-59
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-60
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-61
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-62
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-63
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-64
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-65
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-66
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-67
    robert.collins@canonical.com--general/bazaar--logs--1.4--base-0
    robert.collins@canonical.com--general/bazaar--logs--1.4--patch-1
    robert.collins@canonical.com--general/bazaar--logs--1.4--patch-2
    robert.collins@canonical.com--general/bazaar--logs--1.4--patch-3
    robert.collins@canonical.com--general/bazaar--logs--1.4--patch-4
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-6
    thelove@canonical.com/bazaar--devo--1.4--patch-38
    thelove@canonical.com/bazaar--devo--1.4--patch-39
    thelove@canonical.com/bazaar--devo--1.4--patch-40
    thelove@canonical.com/bazaar--devo--1.4--patch-41
    thelove@canonical.com/bazaar--devo--1.4--patch-42
    thelove@canonical.com/bazaar--devo--1.4--patch-43
    thelove@canonical.com/bazaar--devo--1.4--patch-44
    thelove@canonical.com/bazaar--devo--1.4--patch-45
Summary: merge from thelove
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2005/baz--undorelative--1.4--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-35

 * jblack@gnuarch.org--2005/baz--undorelative--1.4--patch-1
   Undo now handles relative files; minor refactoring of resolved; new arch_project_tree_rel_path_from_user_input

 * john@arbash-meinel.com--tla-2004/bazaar--logs--1.3--base-0
   tag of thelove@canonical.com/bazaar--devo--1.3--patch-42

 * john@arbash-meinel.com--tla-2004/bazaar--logs--1.3--patch-1
   Added appropriate updates to Makefiles so that they handle passing CFLAGS on the command line. And additions for expat

 * john@arbash-meinel.com--tla-2004/bazaar--logs--1.3--patch-5
   Added rel_ws_split_pairs

 * john@arbash-meinel.com--tla-2004/bazaar--logs-b--1.3--base-0
   tag of thelove@canonical.com/bazaar--devo--1.3--patch-47

 * john@arbash-meinel.com--tla-2004/bazaar--logs-b--1.3--patch-1
   Merge of Makefile changes.

 * john@arbash-meinel.com--tla-2004/bazaar--logs-b--1.3--patch-2
   Merged rel_ws_split_pairs.

 * john@arbash-meinel.com--tla-2004/bazaar--logs-b--1.3--patch-3
   Added some convenience functions to arch_patch_id, and the ar_patch_id array.

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-47
   performance tuning branch for baz based on MacOSX performance

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-48
   remove a stale FIXME

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-49
   merge in arch patch id improvements from John Meinels work that are ready for mainline

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-50
   overhaul the interface to arch_trace_ancestry

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-51
   overhaul patch_ancestrys api for talloc and exception friendliness

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-52
   update the ancestry_upload_patch api for patch_ids

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-53
   snapshot during arch_patch_ancestor api updaste

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-54
   arch_patch_ancestor updated

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-55
   update arch_note_ancestory to use patch ids

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-56
   fixup arch_cached_patch_ancestory to throw on PARTIAL

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-57
   some static function cleanup in ancestry.c

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-58
   prevernt talloc_freeing non talloc strings during arch_tag_cacherev

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-59
   convert allocation and freeing for arch_annotated files to be talloc based

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-60
   exception enable annotated-file logic

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-61
   merge from thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-62
   tweak arch_project_tree_rel_path_from_user_input and fix memleak

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-63
   unfuck annotate, broken by my gcc-4.0 warning-fixup. also add a test for the single file case to ensure its not reintroduced

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-64
   exit one leak

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-65
   minor tidy up to annotate source, prepares for method extraction

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-66
   ensure cached revisions have the right tail to make arch_archive_put_cached happy

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-67
   make swo files backup by default

 * robert.collins@canonical.com--general/bazaar--logs--1.4--base-0
   tag of robert.collins@canonical.com--general/bazaar--devel--1.4--patch-48

 * robert.collins@canonical.com--general/bazaar--logs--1.4--patch-1
   start merging Johns logs work

 * robert.collins@canonical.com--general/bazaar--logs--1.4--patch-2
   merge in John Meinels rel_ws_split_pairs routine

 * robert.collins@canonical.com--general/bazaar--logs--1.4--patch-3
   and the commit for the tweaks I made to rel_ws_split_pairs

 * robert.collins@canonical.com--general/bazaar--logs--1.4--patch-4
   merge John Meinels ar_patch_id patch

 * thelove@canonical.com/bazaar--devo--1.4--patch-38
   performance tuning branch for baz based on MacOSX performance

 * thelove@canonical.com/bazaar--devo--1.4--patch-39
   overhaul of ancestry api and internals to use exceptions, arch_patch_id and talloc. includes portions of John Mienels refactoring work

 * thelove@canonical.com/bazaar--devo--1.4--patch-40
   prevernt talloc_freeing non talloc strings during arch_tag_cacherev

 * thelove@canonical.com/bazaar--devo--1.4--patch-41
   overhaul annotated-file api to use exceptions and talloc

 * thelove@canonical.com/bazaar--devo--1.4--patch-42
   Undo now handles relative files; minor refactoring of resolved; new arch_project_tree_rel_path_from_user_input

 * thelove@canonical.com/bazaar--devo--1.4--patch-43
   update arch_project_tree_rel_path_from_user_input to fix memory leak, unbreak annotate which was broken during gcc 4.0 cleanups

 * thelove@canonical.com/bazaar--devo--1.4--patch-44
   ensure cached revisions have the right tail to make arch_archive_put_cached happy

 * thelove@canonical.com/bazaar--devo--1.4--patch-45
   make swo files backup by default

